tools: fix "make distclean"

The original rule to target "distclean" in tools/Rules.mk was in effect
"make clean". It should be "make distclean".

However not all Makefiles in subdirectories have distclean target
defined. So this patch also adds a bunch of distclean targets to various
Makefiles. They only depend on clean target and don't have any actions
in most cases.

With the patch applied, following command outputs 0 results:

  find tools -name 'Makefile*' -exec grep -L 'distclean' {} \+ \
     | grep -v ocaml | grep -v libfsimage

Ocaml and libfsimage are known to have distclean defined in a dedicated
rules file.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 962a743bbebca200054a5939de6cbfc345a877ce..74cf37ea173deb23e8290be34a9d5f3f2cde1d38 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -121,7 +121,7 @@ subdir-all-% subdir-clean-% subdir-install-%: .phony
        $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@)
 
 subdir-distclean-%: .phony
-       $(MAKE) -C $* clean
+       $(MAKE) -C $* distclean
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Tools.mk:

diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index d41758f58eeefefca7bd2988f4ec70d4a1057dc6..94200dc105b4747ce8c947bc5d738a0e97391afa 100644 (file)
--- a/tools/blktap2/Makefile
+++ b/tools/blktap2/Makefile
@@ -14,5 +14,7 @@ SUBDIRS-$(CONFIG_Linux) += control
 clean:
        rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+distclean: clean
+
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%

diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index a88ff4c2cd6714291b62251f7d08df0e13574993..1ae69021a4d492f2679a0eb783cd187d15887156 100644 (file)
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -73,6 +73,8 @@ clean:
        rm -f $(LIBNAME).so $(LIBSONAME)
        rm -f *~
 
-.PHONY: all build clean install
+distclean: clean
+
+.PHONY: all build clean distclean install
 
 -include $(DEPS)

diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 3476fc1c34af42a42bbe475f813c30a9e438fffb..2f96c91b25009c2b5071b2d182a70b090f309b33 100644 (file)
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -108,4 +108,6 @@ install: all
 clean:
        rm -rf .*.d *.o *~ xen TAGS $(IBIN) $(LIB) $(LOCK_UTIL) $(QCOW_UTIL)
 
-.PHONY: clean install
+distclean: clean
+
+.PHONY: clean install distclean

diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile
index f85351ec8763e748d5bb7ae713e7d91dcae76761..c238486b1bc54f4c29a4e418a363d7a0be10d5b3 100644 (file)
--- a/tools/blktap2/include/Makefile
+++ b/tools/blktap2/include/Makefile
@@ -12,3 +12,6 @@ install:
 .PHONY: clean
 clean:
        @:
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index cf8a53b16476dca12436566cdfb1fbc3d5f14e94..7d5f8eab061a5632d45cf76824824d4afaf47137 100644 (file)
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -29,6 +29,8 @@ lvm-util: lvm-util.o
 clean:
        rm -rf *.o *.opic *~ $(DEPS) $(IBIN)
 
-.PHONY: all build clean install lvm-util
+distclean: clean
+
+.PHONY: all build clean distclean install lvm-util
 
 -include $(DEPS)

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index fef0d3636509cc7c48af7968a53cf1f3d2f972e4..9e21cce810baccab540e04bec19c7a6e2e93c71e 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -44,6 +44,8 @@ install: all
 clean: subdirs-clean
        rm -rf *.o *~ $(DEPS) $(IBIN)
 
-.PHONY: all build clean install vhd-util vhd-update
+distclean: clean
+
+.PHONY: all build clean distclean install vhd-util vhd-update
 
 -include $(DEPS)

diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 99e3cdbba004ecf425fe73814be76e3a1f6e5735..3904e9742364622e51afe76c5106862f7ea1414a 100644 (file)
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -75,6 +75,8 @@ install: all
 clean:
        rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
 
-.PHONY: all build clean install libvhd
+distclean: clean
+
+.PHONY: all build clean distclean install libvhd
 
 -include $(DEPS)

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 6e5561853abe55e840432da860740aa31a91e7ce..239ec60043605865015d0022c8562fb87da98ddd 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -22,6 +22,9 @@ clean:
        $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS)
        $(RM) client/*.o daemon/*.o
 
+.PHONY: distclean
+distclean: clean
+
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
        $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS)
 

diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile
index d9e43809f6c2e1b76c1d0fdbbfc33ae61d038713..85501fdf68f2237aefa263dcea7fa217d351b855 100644 (file)
--- a/tools/console/testsuite/Makefile
+++ b/tools/console/testsuite/Makefile
@@ -11,4 +11,7 @@ console-domU: console-domU.o
 procpipe: procpipe.o
 
 .PHONY: clean
-clean:; $(RM) *.o console-domU console-dom0 procpipe
+clean: $(RM) *.o console-domU console-dom0 procpipe
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
index 7938dd84a9801c49ce5167ea629394e1ea1cd002..31eb9005b4b5a6ee5ee297ffab01c0ca15d2cb49 100644 (file)
--- a/tools/debugger/gdbsx/Makefile
+++ b/tools/debugger/gdbsx/Makefile
@@ -12,6 +12,10 @@ clean:
        rm -f xg_all.a gx_all.a gdbsx
        set -e; for d in xg gx; do $(MAKE) -C $$d clean; done
 
+.PHONY: distclean
+distclean: clean
+       set -e; for d in xg gx; do $(MAKE) -c $$d distclean; done
+
 .PHONY: install
 install: all
        [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)

diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile
index 9a0ff07d10f4c48b6a4126bfe86d9b08c8ad805e..3b8467f799107cad13007ebcbd93597e222704a1 100644 (file)
--- a/tools/debugger/gdbsx/gx/Makefile
+++ b/tools/debugger/gdbsx/gx/Makefile
@@ -11,6 +11,8 @@ all: gx_all.a
 clean:
        rm -rf gx_all.a *.o .*.d
 
+.PHONY: distclean
+distclean: clean
 
 #%.o: %.c $(GX_HDRS) Makefile
 #      $(CC) -c $(CFLAGS) -o $@ $<

diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index 76386337ebde2a64dd16dfe5e6b0a13068cc2741..78b4021ce9b02eb6eaba4fdf6f052751770cfad7 100644 (file)
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -33,3 +33,5 @@ xen-headers:
 clean:
        rm -rf xen xg_all.a $(XG_OBJS)  .*.d
 
+.PHONY: distclean
+distclean: clean

diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index 34b781f65cb0edf65e025d5ee9575f2c90892f5d..8eafc82d382d00d46b8e7cab914d5b51565cfdcb 100644 (file)
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -16,6 +16,9 @@ kdd: $(OBJS)
 clean:
        rm -f $(OBJS) $(DEPS) kdd
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install: all
        [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 473580ec303336a56fe358ed079b52fe59ac2bcf..87dd7603cc0702249dd3821b1503de40c0e6b3a2 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -43,3 +43,6 @@ install-configs: $(XEN_CONFIGS)
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 46a79c559c43cf10803e2220bec621cf7df8be04..b759e81487fa445f682a36fddbd9f534ea3a7d53 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -139,4 +139,7 @@ clean: subdirs-clean
        rm -f roms.inc roms.inc.new acpi.h
        rm -f hvmloader hvmloader.tmp *.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index 2c50851a643027a6f3da3ea6aa03b185689221cf..8d918818ac82bf078c36010659733080895cf979 100644 (file)
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -66,6 +66,8 @@ clean:
        rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
        rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl
 
+distclean: clean
+
 install: all
 
 -include $(DEPS)

diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index e5d1cbcd69b16333705fb2d2d9cc6236b546a11b..396906c60f6780886a7016928bb54320cb70bb69 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -15,6 +15,9 @@ all: subdirs-all
 clean: subdirs-clean
        rm -rf *.o $(TARGET) $(DEPS)
 
+.PHONY: distclean
+distclean: subdirs-distclean
+
 $(TARGET): 32bitbios_all.o
        sh mkhex highbios_array 32bitbios_all.o > $@
 

diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index ddb0471970b47f9ecb26cf41a080dec089eb5878..f6f264997d680a4e86bb8391f55d9edc879e620d 100644 (file)
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -12,6 +12,9 @@ all: $(TARGET)
 clean:
        rm -rf *.o $(TARGET) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 $(TARGET): tcgbios.o tpm_drivers.o
        $(LD) $(LDFLAGS_DIRECT) -r $^ -o $@
 

diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index 2f2e4090e72118c799a411d28589a2fca00bfc17..94e65db4c8cc3f8ff9f37d1b45b167ece24032fc 100644 (file)
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -15,6 +15,9 @@ clean: subdirs-clean
        rm -f  BIOS-bochs-*
        rm -f  $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c
        gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c
        bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c

diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
index 26bb871294ffe7d899328845110e273c6b69c4b0..51d9e6e683d29a5593b64a845ca7dba8c6f56500 100644 (file)
--- a/tools/firmware/vgabios/Makefile
+++ b/tools/firmware/vgabios/Makefile
@@ -25,6 +25,9 @@ clean:
           temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
        rm -f VGABIOS-lgpl-latest*.bin
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: release
 release: 
        VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios

diff --git a/tools/flask/Makefile b/tools/flask/Makefile
index bc77a06c6b2a68e9b735c7caa82dfc2ea4e9280e..a31cc16def601adbaf3dfdafeea21db9748e34cf 100644 (file)
--- a/tools/flask/Makefile
+++ b/tools/flask/Makefile
@@ -4,6 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 SUBDIRS-y := utils
 SUBDIRS-$(FLASK_POLICY) += policy
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%
 

diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index 5d8cfbf13389059546950b4e9dbaaff88c0e35ef..54a845beca572cbe446448ee8cc71eeec362c203 100644 (file)
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -115,4 +115,6 @@ policy.conf: $(POLICY_SECTIONS)
 clean:
        $(RM) tmp policy.conf $(POLICY_FILENAME)
 
-.PHONY: all install clean
+distclean: clean
+
+.PHONY: all install clean distclean

diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index c87f15c5c12a7f1c30c183ee21f67d22e7b3c21b..5dfd271221931b20e560ee6f0970233e5687b0c7 100644 (file)
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -39,6 +39,9 @@ clean:
        rm -f $(CLIENTS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: print-dir
 print-dir:
        @echo -n tools/flask/utils: 

diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 6aba64a3aeccb352aae53f9f365e7920f90edee9..8dfc90adf56ec4693218ff5f7a1875dc05613cee 100644 (file)
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -40,3 +40,6 @@ install-rcd:
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b8490f943fcb95035f38b1cdfa269f3da9344782..d94a9cbac01563efb24330d9e628ff91aad3b0a8 100644 (file)
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -81,3 +81,6 @@ install-udev:
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index 51c10fec9eace5533d36afb922aedd1cf9ee82c0..83e3b32f771ceccf9fd738c9bf73c1370f40b277 100644 (file)
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -28,6 +28,9 @@ all:  $(ALL_XEN_SYSTEMD)
 clean:
        rm -f $(XEN_SYSTEMD_MODULES)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install: $(ALL_XEN_SYSTEMD)
        [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \

diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index 14ae9a8a3943dd5747a40cf500f89a658d507cbc..c1a82c1118a28a8e30691c3346ab749e10213a9c 100644 (file)
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -6,5 +6,5 @@ SUBDIRS-$(CONFIG_NetBSD) += NetBSD
 SUBDIRS-$(CONFIG_Linux) += Linux
 SUBDIRS-$(CONFIG_FreeBSD) += FreeBSD
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%

diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index 0a370b85f580ff4813b7008363099e596801d95c..4e609e37263646b37823dc58eb858c8387db2e91 100644 (file)
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -42,3 +42,6 @@ install-rcd:
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile
index 5623abb23cb1719750ff4ed746b9e41490a164a6..b53b55cdcadcac3ea91cba429d3f48a228eb6f04 100644 (file)
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -37,3 +37,6 @@ install-scripts: build
 .PHONY: clean
 clean:
        rm -f $(HOTPLUGPATH)
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/include/Makefile b/tools/include/Makefile
index f7a62569513400132b3ab10def42a0f09f492dc3..601f79c808e8fa66017c9cb90675c4229b96d063 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -50,3 +50,6 @@ clean:
        rm -rf xen
        $(MAKE) -C xen-foreign clean
 
+
+.PHONY: distclean
+distclean: clean

diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
index 06b844c143ce34bdef81b4325cefd5e2f54d630a..ef8fc124a7569104ab78e4584b6d6824d5512c9d 100644 (file)
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -6,7 +6,7 @@ ROOT = $(XEN_ROOT)/xen/include/public
 architectures := arm32 arm64 x86_32 x86_64
 headers := $(patsubst %, %.h, $(architectures))
 
-.PHONY: all clean check-headers
+.PHONY: all clean distclean check-headers
 all: $(headers) check-headers
 
 clean:
@@ -14,6 +14,8 @@ clean:
        rm -f checker checker.c
        rm -f *.pyc *.o *~
 
+distclean: clean
+
 checker: checker.c $(headers)
        $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index bd2ca6ca5080a3f0553bdc47c87482eeb96af5dc..7587d4cc20f76c3f3dc0efcc0d5ca0aa0b0ee4ab 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -170,6 +170,9 @@ clean:
             $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) \
             $(OSDEP_LIB_OBJS) $(OSDEP_PIC_OBJS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: rpm
 rpm: build
        rm -rf staging

diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile
index 2c34f968efa7408901d1cee540f39da5a08fb33b..ce86f20f009055a79968a72114946d07a1e42036 100644 (file)
--- a/tools/memshr/Makefile
+++ b/tools/memshr/Makefile
@@ -39,6 +39,9 @@ install: all
 clean:
        rm -rf *.a *.o *~ $(DEPS)
 
-.PHONY: all build clean install
+.PHONY: distclean
+distclean: clean
+
+.PHONY: all build clean install distclean
 
 -include $(DEPS)

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index a255c22c11ed0b3accdb0583403bbccab15dfaea..ccd36af49ecf529346ff881da2f36736130ac93f 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -62,6 +62,9 @@ install: build
 clean:
        $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xen-hvmctx: xen-hvmctx.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
 

diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index 5710a5fee0e1d532f632c7f70104aa3792be1c61..cfa931a4d01f84847aca3c1ebdbe4dfb1aeea16b 100644 (file)
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -20,3 +20,6 @@ install: subdirs-install
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean

diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules
index 0745e8312aa92ad9af6290157936169531d52d35..179606047e44bbde3e78e125c2165858ca95a38a 100644 (file)
--- a/tools/ocaml/Makefile.rules
+++ b/tools/ocaml/Makefile.rules
@@ -47,6 +47,8 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $(ALL_OCAML_OBJS))
 clean: $(CLEAN_HOOKS)
        $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot *.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make META
 
+distclean: clean
+
 quiet-command = $(if $(V),$1,@printf " %-8s %s\n" "$2" "$3" && $1)
 
 mk-caml-lib-native = $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $1 $2 $3,MLA,$1)

diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile
index 3afdc8964f1fbc93fa85a0d8e5390c46f416f6d9..f7c3c0e64613be5d73e841c647754f4bc9f0a99f 100644 (file)
--- a/tools/ocaml/libs/Makefile
+++ b/tools/ocaml/libs/Makefile
@@ -15,3 +15,6 @@ install: subdirs-install
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 3dff608aac45e58da0436c88bdb7f9099febb4e8..6fd194c6861ca5f82d0f2093a021f59532898991 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -23,4 +23,7 @@ install: all
 clean:
        rm -rf build tmp *.pyc *.pyo *.o *.a *~ a.out $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 533d3dea4169e23a478be4835906a6e1e96d8a15..af951199de8be77e7ea6ae7482cefd83890cfed8 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -28,4 +28,7 @@ clean:
        rm -rf build/
        rm -f $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/tests/mce-test/Makefile b/tools/tests/mce-test/Makefile
index 7c80eb35f77731cf3227262a57c3fe96b79fb426..07a774aeed0ee43cbcef8f9503afb17a2bb2d568 100644 (file)
--- a/tools/tests/mce-test/Makefile
+++ b/tools/tests/mce-test/Makefile
@@ -1,7 +1,10 @@
-.PHONY: all clean
+.PHONY: all clean distclean
 
 all: 
        $(MAKE) -C tools
 
 clean:
        $(MAKE) -C tools clean
+
+distclean:
+       $(MAKE) -C tools distclean

diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile
index aba717750761a6de425be725eda07b5dd59fc9d6..4a0db4963657db08049c6ba150a216d059f105bc 100644 (file)
--- a/tools/tests/mce-test/tools/Makefile
+++ b/tools/tests/mce-test/tools/Makefile
@@ -19,5 +19,8 @@ install: xen-mceinj
 clean:
        $(RM) *.o xen-mceinj
 
+.PHONY: distclean
+distclean: clean
+
 xen-mceinj: xen-mceinj.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)

diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile
index 135450291fe81227629cd615347899f195a442c9..d89e2836fbbba0f87ad4d59ff35ee15c283c7ccd 100644 (file)
--- a/tools/tests/mem-sharing/Makefile
+++ b/tools/tests/mem-sharing/Makefile
@@ -20,6 +20,9 @@ build: $(TARGETS)
 clean:
        $(RM) *.o $(TARGETS) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 memshrtool: memshrtool.o
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl)
 

diff --git a/tools/tests/regression/Makefile b/tools/tests/regression/Makefile
index 6e91023fd027bb324b7996f3d0804142af1ad6c3..70d524aee8dec5b5c2be7466a6d4485ab5b71c2a 100644 (file)
--- a/tools/tests/regression/Makefile
+++ b/tools/tests/regression/Makefile
@@ -22,8 +22,8 @@ check-python-syntax: runtime-environment
 .PHONY: runtime-environment
 runtime-environment: $(PYTHON_VERSIONS)
 
-.PHONY: dist-clean
-dist-clean:
+.PHONY: distclean
+distclean:
        rm -fr $(REG_TEST_DIR)/installed $(REG_TEST_DIR)/downloads \
                $(REG_TEST_DIR)/build
 

diff --git a/tools/tests/vhpet/Makefile b/tools/tests/vhpet/Makefile
index 763409d8b15f26aed8e77ae911ca6672b8a55b96..cb88dd01c5f8ba11871d6540914a6bef30de291d 100644 (file)
--- a/tools/tests/vhpet/Makefile
+++ b/tools/tests/vhpet/Makefile
@@ -26,6 +26,9 @@ $(TARGET): hpet.c main.c hpet.h emul.h Makefile
 clean:
        rm -rf $(TARGET) $(TARGET).out *.o *~ core* hpet.h hpet.c
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install:
 

diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile
index 73517b795fd4c05b8599cc7485717a5f33fe8bcf..b52f227e0b6196e5c19f2498d400aa139c3bd377 100644 (file)
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -34,6 +34,9 @@ $(TARGET): x86_emulate.o test_x86_emulator.o
 clean:
        rm -rf $(TARGET) *.o *~ core blowfish.h blowfish.bin x86_emulate
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install:
 

diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index 65eef99304e0a329b06fe3a2193523444ceda399..f0e94fd860d6c54302ab588a252dc7bfa54257ac 100644 (file)
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -21,6 +21,9 @@ build: $(TARGETS)
 clean:
        $(RM) *.o $(TARGETS) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xen-access: xen-access.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
 

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 1c5237c551b7460a955fdc1d9ce9c1cc4e4cc6d4..fff519d68d1b831f6b9d52c2ed17ff4822d645bb 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -42,4 +42,7 @@ clean:
        $(RM) *.o $(PROGRAMS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index 31e5c62dcf1796b58527e17d298a358ce032f036..b6bc160b1db19b393d2032fd434c34b8834f6fc5 100644 (file)
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -32,6 +32,9 @@ install: build
 clean:
        $(RM) *.a *.so *.o $(DEPS) xenbackendd
 
+.PHONY: distclean
+distclean: clean
+
 xenbackendd: xenbackendd.o
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 3fe87ba538e93a0c4e486c9e9049a7edaef84ed6..c206d9475b210eb8ba655aeac3801635b73f0b90 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -40,6 +40,9 @@ clean:
        $(RM) -f xenbaked xenbaked.o
        $(RM) -f xentrace_setmask setmask.o
 
+.PHONY: distclean
+distclean: clean
+
 xenbaked: xenbaked.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index c742e6271a11438a4fcc4c8130193c503c83cd90..2407a30bf1c65536aae2bb757ceeb32846713762 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -31,7 +31,9 @@ install: all
 clean:
        rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
 
-.PHONY: clean install
+distclean: clean
+
+.PHONY: clean install distclean
 
 .PHONY: TAGS
 TAGS:

diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index 2d925df93d47b91706349b359cccd8532317aa02..4605261d268989ddc7dbf020c585f05edc0dad4e 100644 (file)
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -18,6 +18,9 @@ install: all
 clean:
        $(RM) -f xenpmd xenpmd.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xenpmd: xenpmd.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 

diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile
index 904ccdde7159beb5803d3ad99832cdae4caad55b..901be4a77d36c616726fddfa785da24c5c681e2e 100644 (file)
--- a/tools/xenstat/Makefile
+++ b/tools/xenstat/Makefile
@@ -11,6 +11,6 @@ SUBDIRS += xentop
 endif
 endif
 
-.PHONY: all install clean
+.PHONY: all install clean distclean
 
-all install clean: %: subdirs-%
+all install clean distclean: %: subdirs-%

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 86068cba6093e4753f79b8907b6207d88448ee2a..07d39b1ed21f5ed7d37188a54935be401a4b494e 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -137,4 +137,7 @@ clean:
        rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
              $(BINDINGS) $(BINDINGSRC) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 076e44c700264eee11a7adafc8ed5abcecb672f3..e2665aa87fd0418a9fe44596c248e3d7e24ee558 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -42,4 +42,7 @@ endif
 clean:
        rm -f xentop xentop.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 11b6a0623fcab0d9b4eb5015e23d91839827b1b8..60c3a0872a8b54711a93d42e9076825c0b3e73d0 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -115,6 +115,9 @@ clean:
        rm -f xenstore $(CLIENTS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: TAGS
 TAGS:
        etags `find . -name '*.[ch]'`

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index b821952643ec02cf511a26e79eb3eac28040bd17..a64db864a1eed09b509d01b0b25410377dc6aeab 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -34,6 +34,9 @@ install: build
 clean:
        $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xentrace: xentrace.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS)